remove custom netcdf find function #19
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
I've used this PR plus the following diff diff --git a/CMakeLists.txt b/CMakeLists.txt
index 330c0fb..0404289 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,19 +76,19 @@ foreach (SRC_FILE IN LISTS CPRNC_GenF90_SRCS)
endforeach ()
#===== NetCDF =====
-pkg_check_modules(NetCDF REQUIRED netcdf)
+pkg_check_modules(NetCDF REQUIRED IMPORTED_TARGET netcdf)
#===== NetCDF-Fortran =====
-pkg_check_modules(NetCDF_Fortran REQUIRED netcdf-fortran)
+pkg_check_modules(NetCDF_Fortran REQUIRED IMPORTED_TARGET netcdf-fortran)
add_executable (cprnc ${CPRNC_Fortran_SRCS} ${CPRNC_GenF90_SRCS})
-target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${NetCDF_Fortran_INCLUDE_DIRS})
+target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_dependencies (cprnc genf90)
# Always use -fPIC
set_property(TARGET cprnc PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries (cprnc
- PUBLIC ${NetCDF_Fortran_LIBRARIES} ${NetCDF_LIBRARIES})
+ PUBLIC PkgConfig::NetCDF_Fortran PkgConfig::NetCDF)
# We do not want cprnc injecting ctests into parent projects
if (CPRNC_STANDALONE)and verified that CMAKE_INSTALL_RPATH_USE_LINK_PATH works. The upside of |
Collaborator
Author
|
I also ran the cime test_self_build_cprnc:(test_sys_cime_case.TestCimeCase) ... ok |
jgfouca
approved these changes
Dec 4, 2024
Contributor
jgfouca
left a comment
jgfouca
left a comment
There was a problem hiding this comment.
This is a great change, thanks!
climbfuji
reviewed
Dec 5, 2024
| endforeach () | ||
|
|
||
| #===== NetCDF ===== | ||
| pkg_check_modules(NetCDF REQUIRED IMPORTED_TARGET netcdf) |
There was a problem hiding this comment.
Does this work with static libraries?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove the custom code used to find netcdf and use pkg_config instead.